Skip to content

chore(deps): github.com/docker/cli v29.6.0, github.com/docker/buildx v0.35.0, buildkit v0.31.0#13842

Open
thaJeztah wants to merge 3 commits into
docker:mainfrom
thaJeztah:bump_cli_buildx2
Open

chore(deps): github.com/docker/cli v29.6.0, github.com/docker/buildx v0.35.0, buildkit v0.31.0#13842
thaJeztah wants to merge 3 commits into
docker:mainfrom
thaJeztah:bump_cli_buildx2

Conversation

@thaJeztah

@thaJeztah thaJeztah commented Jun 15, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah force-pushed the bump_cli_buildx2 branch 7 times, most recently from 534f4dd to 75315be Compare June 16, 2026 11:41
@thaJeztah

thaJeztah commented Jun 16, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

Failure looks consistent, but not sure if it's my PR, or if something broken on main;

=== Failed
=== FAIL: pkg/e2e TestPublishChecks/detect_sensitive_data (0.03s)
    publish_test.go:152: assertion failed: expression is false: strings.Contains(output, "JSON Web Token\n\"\": ***"+"eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw"): you are about to publish sensitive data within your OCI artifact.
        please double check that you are not leaking sensitive data
        AWS Client ID
        "services.serviceA.environment.AWS_ACCESS_KEY_ID": A3TX1234567890ABCDEF
        AWS Secret Key
        "services.serviceA.environment.AWS_SECRET_ACCESS_KEY": aws"12345+67890/abcdefghijklm+NOPQRSTUVWXYZ+"
        Keyword Detector
        "secrets.mysecret.file": /home/runner/work/compose/compose/pkg/e2e/fixtures/publish/secret.txt
        Github authentication
        "GITHUB_TOKEN": ***
        Private Key
        "": -----BEGIN DSA PRIVATE KEY-----
        wxyz+ABC=
        -----END DSA PRIVATE KEY-----
        Are you ok to publish these sensitive data?warning: GOCOVERDIR not set, no coverage data emitted
        
        
    --- FAIL: TestPublishChecks/detect_sensitive_data (0.03s)

thaJeztah
thaJeztah commented Jun 16, 2026
View reviewed changes
Comment thread go.mod
github.com/gofrs/flock v0.13.0 // indirect
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect

@thaJeztah thaJeztah Jun 16, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe changes in this? golang-jwt/jwt@v5.3.0...v5.3.1

@thaJeztah thaJeztah Jun 19, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☝️ it was! #13857

@thaJeztah thaJeztah mentioned this pull request Jun 16, 2026
Merged
1 task
@stasadev stasadev mentioned this pull request Jun 19, 2026
Merged
@thaJeztah thaJeztah mentioned this pull request Jun 19, 2026
Merged
@thaJeztah thaJeztah changed the title chore(deps): github.com/docker/cli v29.6.0-rc.1, github.com/docker/buildx v0.35.0-rc2, buildkit v0.31.0-rc2 chore(deps): github.com/docker/cli v29.6.0, github.com/docker/buildx v0.35.0, buildkit v0.31.0 Jun 19, 2026
@codecov

codecov Bot commented Jun 19, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 15 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
pkg/mocks/mock_docker_api.go 0.00% 13 Missing ⚠️
pkg/dryrun/dryrunclient.go 0.00% 2 Missing ⚠️

📢 Thoughts on this report? Let us know!

thaJeztah added 3 commits June 19, 2026 17:07
@thaJeztah
chore(deps): go.opentelemetry.io/otel v1.44.0, go.opentelemetry.io/co…
786f68e 
…ntrib v0.69.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
chore(deps): github.com/docker/cli v29.6.0
9e746c8 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
chore(deps): github.com/docker/buildx v0.35.0, buildkit v0.31.0
dfd07a4 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah marked this pull request as ready for review June 19, 2026 15:08
@thaJeztah thaJeztah requested a review from a team as a code owner June 19, 2026 15:08
@thaJeztah thaJeztah requested review from Copilot, glours and ndeloof June 19, 2026 15:08
Copilot AI reviewed Jun 19, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates Docker-related Go module dependencies (Docker CLI, Buildx, BuildKit, Moby client) and aligns internal wrappers/mocks with newly introduced Docker API surface so the codebase continues to compile against the upgraded client interfaces.

Changes:

  • Bump core dependencies: github.com/docker/cli to v29.6.0, github.com/docker/buildx to v0.35.0, and github.com/moby/buildkit to v0.31.0 (plus related indirect updates via go.mod/go.sum).
  • Add ImageAttestations support to the dry-run client to satisfy the updated client.APIClient interface.
  • Regenerate/update the GoMock APIClient mock to include ImageAttestations.

Reviewed changes

Copilot reviewed 2 out of 4 changed files in this pull request and generated no comments.

File Description
pkg/mocks/mock_docker_api.go Updates generated client.APIClient gomock with the new ImageAttestations method.
pkg/dryrun/dryrunclient.go Adds DryRunClient.ImageAttestations delegating to the underlying API client.
go.mod Bumps Docker/Buildx/BuildKit + related dependency versions and adjusts indirect requirements.
go.sum Updates dependency checksums to match the new module versions.
Files not reviewed (1)
  • pkg/mocks/mock_docker_api.go: Generated file

docker-agent[bot]
docker-agent Bot reviewed Jun 19, 2026
View reviewed changes

@docker-agent docker-agent Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assessment: 🟢 APPROVE

Dependency bump review for github.com/docker/cli v29.6.0, github.com/docker/buildx v0.35.0, github.com/moby/buildkit v0.31.0.

Summary of code changes:

  • pkg/dryrun/dryrunclient.go: Added ImageAttestations method to satisfy the updated client.APIClient interface from github.com/moby/moby/client v0.5.0. The implementation correctly delegates to the underlying apiClient, consistent with other read-only methods on DryRunClient. The compile-time assertion (var _ client.APIClient = &DryRunClient{}) ensures interface completeness.

  • pkg/mocks/mock_docker_api.go: Added the corresponding gomock stub for ImageAttestations, following the same variadic pattern used by ImageHistory and other methods. Recorder method is also correctly added.

  • go.mod / go.sum: Routine version bumps with correctly matched hash pairs.

No bugs, logic errors, missing implementations, resource leaks, or security issues were found in the added code.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@docker-agent docker-agent[bot] docker-agent[bot] left review comments

@ndeloof ndeloof Awaiting requested review from ndeloof ndeloof is a code owner automatically assigned from docker/compose-maintainers

@glours glours Awaiting requested review from glours glours is a code owner automatically assigned from docker/compose-maintainers

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah